Merge branch 'master' into places-sidebar
authorFederico Mena Quintero <federico@gnome.org>
Thu, 14 Feb 2013 02:15:46 +0000 (20:15 -0600)
committerFederico Mena Quintero <federico@gnome.org>
Thu, 14 Feb 2013 02:37:36 +0000 (20:37 -0600)
commit936045e82bc9a3f2b09612e3c22799c45b101c5e
treee4cda00f3d42e8840b11dfa5317a92cf63dcd6a6
parent04dbec41913bcfe5b627869ab7c8c3b0797ddd72
parente16ade9836a9ad2a5a4ad568ccd9ed6ed2d7f62d
Merge branch 'master' into places-sidebar

Conflicts:
docs/reference/gtk/gtk-docs.sgml
gtk/gtkfilechooserdefault.c
gtk/org.gtk.Settings.FileChooser.gschema.xml
docs/reference/gtk/gtk-docs.sgml
docs/reference/gtk/gtk3-sections.txt
gtk/Makefile.am
gtk/gtk.h
gtk/gtkfilechooser.c
gtk/gtkfilechooserbutton.c
gtk/gtkfilechooserdefault.c
gtk/gtkfilechooserprivate.h
gtk/gtkplacessidebar.c
gtk/org.gtk.Settings.FileChooser.gschema.xml
po/POTFILES.in